From 511e96b414a4b73ab6f2a5897baf42736368a56e Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Sat, 28 Apr 2018 13:15:15 -0600 Subject: [PATCH] fix xol test to be compatible with msvc runtime. --- reference/nonexistent_alternate.err | 1 + testo.d/xol.test | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 reference/nonexistent_alternate.err diff --git a/reference/nonexistent_alternate.err b/reference/nonexistent_alternate.err new file mode 100644 index 000000000..1867d1587 --- /dev/null +++ b/reference/nonexistent_alternate.err @@ -0,0 +1 @@ +Cannot open './reference/doesnotexist' for read. Error was 'The system cannot find the file specified'. diff --git a/testo.d/xol.test b/testo.d/xol.test index b57aee7d4..b4135a899 100644 --- a/testo.d/xol.test +++ b/testo.d/xol.test @@ -18,7 +18,8 @@ ${PNAME} -i xol -f ${REFERENCE}/doesnotexist -o gpx -F ${TMPDIR}/xol-sample_si.g # check error message is what we expected # Note that the reference file nonexistent.err includes the file path, # so this will fail when starting from a directory other than gpsbabel. -compare ${REFERENCE}/nonexistent.err ${TMPDIR}/nonexistent.err +# the message can vary depending on the c runtime, .i.e. msvc and gcc are slightly different. +compare_with_alternate ${REFERENCE}/nonexistent.err ${REFERENCE}/nonexistent_alternate.err ${TMPDIR}/nonexistent.err gpsbabel -i gpx -f ${REFERENCE}/xol-sample.gpx -o xol -F ${TMPDIR}/xol-sample-gpx.xol -- 2.30.2